[IA64] warning cleanup

Signed-off-by: Alex Williamson <alex.williamson@hp.com>

diff --git a/xen/arch/ia64/vmx/mm.c b/xen/arch/ia64/vmx/mm.c
index 9fb4a0d1e904f90a39275c8b1c756c327baf3f47..814df3dd8a7d2f1719a032a7bb5ef24597846a9f 100644 (file)
--- a/xen/arch/ia64/vmx/mm.c
+++ b/xen/arch/ia64/vmx/mm.c
@@ -106,11 +106,11 @@ int vmx_do_mmu_update(mmu_update_t *ureqs,u64 count,u64 *pdone,u64 foreigndom)
     u64 mfn, gpfn;
     VCPU *vcpu;
     mmu_update_t req;
-    ia64_rr rr;
+    /* ia64_rr rr; */
     thash_cb_t *hcb;
-    thash_data_t entry={0},*ovl;
+    /* thash_data_t entry={0},*ovl; */
     vcpu = current;
-    search_section_t sections;
+    /* search_section_t sections; */
     hcb = vmx_vcpu_get_vtlb(vcpu);
     for ( i = 0; i < count; i++ )
     {

diff --git a/xen/arch/ia64/vmx/vmmu.c b/xen/arch/ia64/vmx/vmmu.c
index 98b59e0902a44e163ec9c1853ed56775f194591c..2f94ae9e3a553144e6bb1cabe0af950c178e2ad2 100644 (file)
--- a/xen/arch/ia64/vmx/vmmu.c
+++ b/xen/arch/ia64/vmx/vmmu.c
@@ -477,7 +477,7 @@ IA64FAULT vmx_vcpu_itr_i(VCPU *vcpu, UINT64 pte, UINT64 itir, UINT64 ifa, UINT64
     thash_cb_t  *hcb;
     search_section_t sections;
     ia64_rr vrr;
-    u64 mfn,psr;
+    /* u64 mfn,psr; */
 
     hcb = vmx_vcpu_get_vtlb(vcpu);
     data.page_flags=pte & ~PAGE_FLAGS_RV_MASK;
@@ -527,7 +527,7 @@ IA64FAULT vmx_vcpu_itr_d(VCPU *vcpu, UINT64 pte, UINT64 itir, UINT64 ifa, UINT64
     thash_cb_t  *hcb;
     search_section_t sections;
     ia64_rr    vrr;
-    u64 mfn,psr;
+    /* u64 mfn,psr; */
 
     hcb = vmx_vcpu_get_vtlb(vcpu);
     data.page_flags=pte & ~PAGE_FLAGS_RV_MASK;

diff --git a/xen/arch/ia64/vmx/vtlb.c b/xen/arch/ia64/vmx/vtlb.c
index e2fe32faab0967158d538d61c7e35388b3172678..ac4905a11c62cd065af0c7db911fcc9e5e3129a5 100644 (file)
--- a/xen/arch/ia64/vmx/vtlb.c
+++ b/xen/arch/ia64/vmx/vtlb.c
@@ -29,6 +29,7 @@
 #include <linux/interrupt.h>
 #include <asm/vmx_vcpu.h>
 #include <asm/vmmu.h>
+#include <asm/tlbflush.h>
 #define  MAX_CCH_LENGTH     40
 
 thash_data_t *__alloc_chain(thash_cb_t *, thash_data_t *);
@@ -52,7 +53,7 @@ static thash_data_t *cch_alloc(thash_cb_t *hcb)
 
     if ( (p = hcb->cch_freelist) != NULL ) {
         hcb->cch_freelist = p->next;
-        return p;
+        return (thash_data_t *)p;
     }else{
         return NULL;
     }
@@ -295,7 +296,7 @@ int __tlb_to_vhpt(thash_cb_t *hcb,
             thash_data_t *tlb, u64 va,
             thash_data_t *vhpt)
 {
-    u64 pages,mfn,padr,pte;
+    u64 padr,pte;
 //    ia64_rr vrr;
     ASSERT ( hcb->ht == THASH_VHPT );
 //    vrr = (hcb->get_rr_fn)(hcb->vcpu,va);
@@ -340,7 +341,7 @@ void thash_vhpt_insert(thash_cb_t *hcb, thash_data_t *entry, u64 va)
     //panic("Can't convert to machine VHPT entry\n");
     }
 
-    hash_table = ia64_thash(va);
+    hash_table = (thash_data_t *)ia64_thash(va);
     if( INVALID_VHPT(hash_table) ) {
         *hash_table = vhpt_entry;
         hash_table->next = 0;
@@ -393,7 +394,7 @@ thash_data_t * vhpt_lookup(u64 va)
 {
     thash_data_t *hash;
     u64 tag;
-    hash = ia64_thash(va);
+    hash = (thash_data_t *)ia64_thash(va);
     tag = ia64_ttag(va);
     while(hash){
        if(hash->etag == tag)
@@ -456,7 +457,7 @@ static void vhpt_purge(thash_cb_t *hcb, u64 va, u64 ps)
     start = va & (-size);
     end = start + size;
     while(start < end){
-       hash_table = ia64_thash(start);
+       hash_table = (thash_data_t *)ia64_thash(start);
            tag = ia64_ttag(start);
        if(hash_table->etag == tag ){
             __rem_hash_head(hcb, hash_table);
@@ -566,10 +567,10 @@ thash_data_t *__alloc_chain(thash_cb_t *hcb,thash_data_t *entry)
 void vtlb_insert(thash_cb_t *hcb, thash_data_t *entry, u64 va)
 {
     thash_data_t    *hash_table, *cch;
-    int flag;
+    /* int flag; */
     ia64_rr vrr;
-    u64 gppn;
-    u64 ppns, ppne, tag;
+    /* u64 gppn, ppns, ppne; */
+    u64 tag;
     vrr=vmx_vcpu_rr(current, va);
     if (vrr.ps != entry->ps) {
 //        machine_tlb_insert(hcb->vcpu, entry);
@@ -716,6 +717,7 @@ static thash_data_t *thash_rem_cch(thash_cb_t *hcb, thash_data_t *cch)
         return cch;
     }
 }
+ */
 
 /*
  * Purge one hash line (include the entry in hash table).
@@ -950,9 +952,10 @@ void thash_purge_entries_ex(thash_cb_t *hcb,
             search_section_t p_sect,
             CACHE_LINE_TYPE cl)
 {
+/*
     thash_data_t    *ovl;
 
-/*    ovl = (hcb->find_overlap)(hcb, va, PSIZE(ps), rid, cl, p_sect);
+    ovl = (hcb->find_overlap)(hcb, va, PSIZE(ps), rid, cl, p_sect);
     while ( ovl != NULL ) {
         (hcb->rem_hash)(hcb, ovl);
         ovl = (hcb->next_overlap)(hcb);
@@ -968,7 +971,7 @@ void thash_purge_entries_ex(thash_cb_t *hcb,
  */
 void thash_purge_and_insert(thash_cb_t *hcb, thash_data_t *in, u64 va)
 {
-    thash_data_t    *ovl;
+    /* thash_data_t    *ovl; */
     search_section_t sections;
 
 #ifdef   XEN_DEBUGGER
@@ -1040,9 +1043,10 @@ static void thash_purge_line(thash_cb_t *hcb, thash_data_t *hash)
 // TODO: add sections.
 void thash_purge_all(thash_cb_t *hcb)
 {
-    thash_data_t    *hash_table, *entry;
+    thash_data_t    *hash_table;
+    /* thash_data_t    *entry; */
     thash_cb_t  *vhpt;
-    u64 i, start, end;
+    /* u64 i, start, end; */
 
 #ifdef  VTLB_DEBUG
        extern u64  sanity_check;

diff --git a/xen/include/asm-ia64/vmmu.h b/xen/include/asm-ia64/vmmu.h
index edd8bc6f6c01946af71a81a1a7ad783fcdb9a70b..733314bd3b053e9581ee082695dffbbae84f7ab4 100644 (file)
--- a/xen/include/asm-ia64/vmmu.h
+++ b/xen/include/asm-ia64/vmmu.h
@@ -31,10 +31,6 @@
 #define         VCPU_VHPT_SIZE           (1UL<<VCPU_VHPT_SHIFT)
 #define         VCPU_VHPT_ORDER          (VCPU_VHPT_SHIFT - PAGE_SHIFT)
 
-#define         PTA_BASE_SHIFT          (15)
-
-
-
 #ifndef __ASSEMBLY__
 
 #include <xen/config.h>
@@ -384,6 +380,7 @@ extern ia64_rr vmmu_get_rr(struct vcpu *vcpu, u64 va);
 extern thash_cb_t *init_domain_tlb(struct vcpu *d);
 extern thash_data_t * vsa_thash(PTA vpta, u64 va, u64 vrr, u64 *tag);
 extern thash_data_t * vhpt_lookup(u64 va);
+extern void machine_tlb_purge(u64 va, u64 ps);
 
 //#define   VTLB_DEBUG
 #ifdef   VTLB_DEBUG

diff --git a/xen/include/asm-ia64/vmx_vcpu.h b/xen/include/asm-ia64/vmx_vcpu.h
index bb34a4a4aed0d72816d4bc6a8c14ab272da2dc34..2f65d32b2d48bd9e197ccd0af7aee990e97acfbd 100644 (file)
--- a/xen/include/asm-ia64/vmx_vcpu.h
+++ b/xen/include/asm-ia64/vmx_vcpu.h
@@ -120,6 +120,14 @@ extern void memwrite_p(VCPU *vcpu, u64 *src, u64 *dest, size_t s);
 extern void vcpu_load_kernel_regs(VCPU *vcpu);
 extern IA64FAULT vmx_vcpu_increment_iip(VCPU *vcpu);
 extern void vmx_switch_rr7(unsigned long ,shared_info_t*,void *,void *,void *);
+
+extern void dtlb_fault (VCPU *vcpu, u64 vadr);
+extern void nested_dtlb (VCPU *vcpu);
+extern void alt_dtlb (VCPU *vcpu, u64 vadr);
+extern void dvhpt_fault (VCPU *vcpu, u64 vadr);
+extern void dnat_page_consumption (VCPU *vcpu, uint64_t vadr);
+extern void page_not_present(VCPU *vcpu, u64 vadr);
+
 /**************************************************************************
  VCPU control register access routines
 **************************************************************************/